From 47c2b0e0636e4c558d7fcc08a72e38fd2dd453e6 Mon Sep 17 00:00:00 2001 From: "smh22@labyrinth.cl.cam.ac.uk" Date: Wed, 29 Oct 2003 17:48:06 +0000 Subject: [PATCH] bitkeeper revision 1.539.1.1 (3f9ffd56ju-qX7ro1SVzJmd1_pp1sg) temporary fix --- BitKeeper/etc/ignore | 5 +++++ xen/drivers/block/xen_block.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index e51474b789..33a9945db7 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -474,3 +474,8 @@ tools/misc/xen_read_console extras/mini-os/h/hypervisor-ifs xen/BLOG xen/drivers/block/xen_vbd.o +tools/internal/xi_vif_params +tools/misc/xen_cpuperf +tools/misc/xen_log +tools/misc/xen_refresh_dev +xenolinux-2.4.22-sparse/arch/xeno/drivers/block/device diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c index 967a1c21b9..e3daf43ae4 100644 --- a/xen/drivers/block/xen_block.c +++ b/xen/drivers/block/xen_block.c @@ -583,11 +583,15 @@ static void dispatch_probe(struct task_struct *p, int index) */ xdi = map_domain_mem(buffer); xdi->count = 0; +#if 0 // XXX SMH: fix below once done proper vbd/physd rewrit if(IS_PRIV(p)) { +#endif /* privilege domains always gets access to the 'real' devices */ ide_probe_devices(xdi); scsi_probe_devices(xdi); +#if 0 } +#endif vbd_probe_devices(xdi, p); unmap_domain_mem(xdi); -- 2.30.2